From 2be5af44c4f0a06865e61da18b4ec331dfff326b Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sat, 16 Jun 2012 18:00:32 -0500 Subject: [PATCH] Update debian/control* and debian/copyright for emacs24. --- debian/control | 58 +++++++++++++++++++++++------------------------ debian/control.in | 14 ++++++------ debian/copyright | 4 ++-- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/debian/control b/debian/control index abce1081f8e..b7a1d785a08 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: emacs23 +Source: emacs24 Section: editors Priority: optional Maintainer: Rob Browning @@ -14,67 +14,67 @@ Standards-Version: 3.7.2 Package: emacs Architecture: all -Depends: emacs23 | emacs23-lucid | emacs23-nox, ${misc:Depends} +Depends: emacs24 | emacs24-lucid | emacs24-nox, ${misc:Depends} Provides: emacsen, editor, mail-reader, news-reader Description: The GNU Emacs editor (metapackage) GNU Emacs is the extensible self-documenting text editor. This is a metapackage which will always depend on the latest Emacs release. -Package: emacs23-lucid +Package: emacs24-lucid Architecture: any -Depends: emacs23-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Provides: emacs23, emacsen, editor, info-browser, mail-reader, news-reader -Suggests: emacs23-common-non-dfsg -Conflicts: emacs23, emacs23-nox, emacs23-gtk -Replaces: emacs23, emacs23-nox, emacs23-gtk +Depends: emacs24-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Provides: emacs24, emacsen, editor, info-browser, mail-reader, news-reader +Suggests: emacs24-common-non-dfsg +Conflicts: emacs24, emacs24-nox +Replaces: emacs24, emacs24-nox Description: The GNU Emacs editor GNU Emacs is the extensible self-documenting text editor. This package contains a version of Emacs with a Lucid user interface. -Package: emacs23-nox +Package: emacs24-nox Architecture: any -Depends: emacs23-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Provides: emacs23, editor, emacsen, info-browser, mail-reader, news-reader -Suggests: emacs23-common-non-dfsg -Conflicts: emacs23, emacs23-lucid, emacs23-gtk -Replaces: emacs23, emacs23-lucid, emacs23-gtk +Depends: emacs24-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Provides: emacs24, editor, emacsen, info-browser, mail-reader, news-reader +Suggests: emacs24-common-non-dfsg +Conflicts: emacs24, emacs24-lucid +Replaces: emacs24, emacs24-lucid Description: The GNU Emacs editor (without X support) GNU Emacs is the extensible self-documenting text editor. This package contains a version of Emacs compiled without support for X. -Package: emacs23 +Package: emacs24 Architecture: any -Depends: emacs23-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Provides: editor, emacsen, info-browser, mail-reader, news-reader, emacs23-gtk -Suggests: emacs23-common-non-dfsg -Conflicts: emacs23-lucid, emacs23-nox, emacs23-gtk -Replaces: emacs23-lucid, emacs23-nox, emacs23-gtk +Depends: emacs24-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Provides: editor, emacsen, info-browser, mail-reader, news-reader +Suggests: emacs24-common-non-dfsg +Conflicts: emacs24-lucid, emacs24-nox +Replaces: emacs24-lucid, emacs24-nox Description: The GNU Emacs editor (with GTK+ user interface) GNU Emacs is the extensible self-documenting text editor. This package contains a version of Emacs with a GTK+ user interface. -Package: emacs23-bin-common +Package: emacs24-bin-common Architecture: any -Depends: emacs23-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: emacs24-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} Description: The GNU Emacs editor's shared, architecture dependent files GNU Emacs is the extensible self-documenting text editor. This package contains the architecture dependent infrastructure - that's shared by emacs23, emacs23-lucid, and emacs23-nox. + that's shared by emacs24, emacs24-lucid, and emacs24-nox. -Package: emacs23-common +Package: emacs24-common Architecture: all Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.15.4) | install-info, ${shlibs:Depends}, ${misc:Depends} -Suggests: emacs23-el, emacs23-common-non-dfsg -Conflicts: emacs23-el (<< ${Source-Version}), cedet, eieio, speedbar +Suggests: emacs24-el, emacs24-common-non-dfsg +Conflicts: emacs24-el (<< ${Source-Version}), cedet, eieio, speedbar Description: The GNU Emacs editor's shared, architecture independent infrastructure GNU Emacs is the extensible self-documenting text editor. This package contains the architecture independent infrastructure - that's shared by emacs23, emacs23-lucid, and emacs23-nox. + that's shared by emacs24, emacs24-lucid, and emacs24-nox. -Package: emacs23-el +Package: emacs24-el Architecture: all -Depends: emacs23-common (= ${source:Version}), ${misc:Depends} +Depends: emacs24-common (= ${source:Version}), ${misc:Depends} Description: GNU Emacs LISP (.el) files GNU Emacs is the extensible self-documenting text editor. This package contains the elisp sources for the convenience of users, diff --git a/debian/control.in b/debian/control.in index 20d3e68403c..189514ce2c7 100644 --- a/debian/control.in +++ b/debian/control.in @@ -26,8 +26,8 @@ Architecture: any Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Provides: @DEB_FLAVOR@, emacsen, editor, info-browser, mail-reader, news-reader Suggests: @DEB_FLAVOR@-common-non-dfsg -Conflicts: @DEB_FLAVOR@, @DEB_FLAVOR@-nox, emacs23-gtk -Replaces: @DEB_FLAVOR@, @DEB_FLAVOR@-nox, emacs23-gtk +Conflicts: @DEB_FLAVOR@, @DEB_FLAVOR@-nox +Replaces: @DEB_FLAVOR@, @DEB_FLAVOR@-nox Description: The GNU Emacs editor GNU Emacs is the extensible self-documenting text editor. This package contains a version of Emacs with a Lucid user interface. @@ -37,8 +37,8 @@ Architecture: any Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Provides: @DEB_FLAVOR@, editor, emacsen, info-browser, mail-reader, news-reader Suggests: @DEB_FLAVOR@-common-non-dfsg -Conflicts: @DEB_FLAVOR@, @DEB_FLAVOR@-lucid, emacs23-gtk -Replaces: @DEB_FLAVOR@, @DEB_FLAVOR@-lucid, emacs23-gtk +Conflicts: @DEB_FLAVOR@, @DEB_FLAVOR@-lucid +Replaces: @DEB_FLAVOR@, @DEB_FLAVOR@-lucid Description: The GNU Emacs editor (without X support) GNU Emacs is the extensible self-documenting text editor. This package contains a version of Emacs compiled without support for X. @@ -46,10 +46,10 @@ Description: The GNU Emacs editor (without X support) Package: @DEB_FLAVOR@ Architecture: any Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Provides: editor, emacsen, info-browser, mail-reader, news-reader, emacs23-gtk +Provides: editor, emacsen, info-browser, mail-reader, news-reader Suggests: @DEB_FLAVOR@-common-non-dfsg -Conflicts: @DEB_FLAVOR@-lucid, @DEB_FLAVOR@-nox, emacs23-gtk -Replaces: @DEB_FLAVOR@-lucid, @DEB_FLAVOR@-nox, emacs23-gtk +Conflicts: @DEB_FLAVOR@-lucid, @DEB_FLAVOR@-nox +Replaces: @DEB_FLAVOR@-lucid, @DEB_FLAVOR@-nox Description: The GNU Emacs editor (with GTK+ user interface) GNU Emacs is the extensible self-documenting text editor. This package contains a version of Emacs with a GTK+ user interface. diff --git a/debian/copyright b/debian/copyright index d78ec95166a..28cd6465e17 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ This package was debianized by Rob Browning on Tue, 16 Dec 1997 00:05:45 -0600. -The original source archive is emacs-23.4.tar.gz, and it +The original source archive is emacs-24.1.tar.gz, and it can be found here for stable releases: ftp://ftp.gnu.org:/gnu/emacs/ @@ -12,7 +12,7 @@ and here for alpha pre-releases: ftp://alpha.gnu.org:/gnu/emacs/pretest/ -Please see /usr/share/doc/emacs23-common/README.Debian.gz for a +Please see /usr/share/doc/emacs24-common/README.Debian.gz for a description of the Debian specific differences from the upstream version. -- 2.30.2